Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 11 May 2010 12:54:50 +0000 (12:54 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 11 May 2010 12:54:50 +0000 (12:54 +0000)

Trivial merge